From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Tue, 7 Dec 2010 21:53:50 +0000 (+0000)
Subject: Filenames with quotes fail here.
X-Git-Tag: 1.31.0-rc.0~33457
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=fea4fd2d5ef0b49bd705acd1b8b6a8b215ac1385;p=lhc%2Fweb%2Fwiklou.git

Filenames with quotes fail here.
---

diff --git a/maintenance/tests/phpunit/includes/api/RandomImageGenerator.php b/maintenance/tests/phpunit/includes/api/RandomImageGenerator.php
index 05861f93e8..6bb9d00fee 100644
--- a/maintenance/tests/phpunit/includes/api/RandomImageGenerator.php
+++ b/maintenance/tests/phpunit/includes/api/RandomImageGenerator.php
@@ -200,7 +200,7 @@ class RandomImageGenerator {
 			$drawCommand = "fill $fill  circle $originX,$originY $perimeterX,$perimeterY";
 			$args[] = '-draw ' . wfEscapeShellArg( $drawCommand );
 		}
-		$args[] = $filename;
+		$args[] = wfEscapeShellArg( $filename );
 
 		$command = wfEscapeShellArg( $wgImageMagickConvertCommand ) . " " . implode( " ", $args );
 		$retval = null;